win32: make init_root_window private to the screen object

It can be called during the screen object initilization

diff --git a/gdk/win32/gdkdisplay-win32.c b/gdk/win32/gdkdisplay-win32.c
index 86a644d156616255942d5ef58ddb5f9b40849381..c4b66cf0b96dfd75994b176d38b26c295a19c4bd 100644 (file)
--- a/gdk/win32/gdkdisplay-win32.c
+++ b/gdk/win32/gdkdisplay-win32.c
@@ -266,7 +266,6 @@ _gdk_win32_display_open (const gchar *display_name)
 
   win32_display->screen = g_object_new (GDK_TYPE_WIN32_SCREEN, NULL);
 
-  _gdk_screen_init_root_window (GDK_WIN32_SCREEN (win32_display->screen));
   _gdk_events_init ();
   _gdk_input_init (_gdk_display);
   _gdk_dnd_init ();

diff --git a/gdk/win32/gdkprivate-win32.h b/gdk/win32/gdkprivate-win32.h
index eb3dc99c216142a2c6ffb95368b54f382bd0437a..5119e5e42ac797b60dad769e34809d23479cbb28 100644 (file)
--- a/gdk/win32/gdkprivate-win32.h
+++ b/gdk/win32/gdkprivate-win32.h
@@ -525,7 +525,6 @@ guint32 _gdk_win32_keymap_get_decimal_mark (void);
 /* Initialization */
 void _gdk_win32_windowing_init (void);
 void _gdk_screen_init_monitors (GdkWin32Screen *screen);
-void _gdk_screen_init_root_window (GdkWin32Screen *screen_win32);
 void _gdk_screen_init_root_window_size (GdkWin32Screen *screen);
 void _gdk_dnd_init    (void);
 void _gdk_events_init (void);

diff --git a/gdk/win32/gdkscreen-win32.c b/gdk/win32/gdkscreen-win32.c
index c3eb3b8d7cd16ac7a19c02f13ba9d253ece0ee9e..46bc89ba8b7efcb70b4b9437de488dc56077144a 100644 (file)
--- a/gdk/win32/gdkscreen-win32.c
+++ b/gdk/win32/gdkscreen-win32.c
@@ -270,8 +270,8 @@ _gdk_screen_init_root_window_size (GdkWin32Screen *screen)
   screen->root_window->height = rect.height;
 }
 
-void
-_gdk_screen_init_root_window (GdkWin32Screen *screen_win32)
+static void
+init_root_window (GdkWin32Screen *screen_win32)
 {
   GdkScreen *screen;
   GdkWindow *window;
@@ -463,6 +463,8 @@ gdk_win32_screen_init (GdkWin32Screen *win32_screen)
 
   _gdk_screen_init_monitors (win32_screen);
 
+  init_root_window (win32_screen);
+
   /* On Windows 8 and later, DWM (composition) is always enabled */
   win32_screen->always_composited = g_win32_check_windows_version (6, 2, 0, G_WIN32_OS_ANY);
 }